From ed61ba20b684a9308a74cbfcd36dcce89c3da31d Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sat, 12 Nov 2016 10:33:59 +0100 Subject: [PATCH] Fixed too long lines --- src/cargo/sources/path.rs | 14 ++++++++++++-- src/cargo/util/toml.rs | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index e5a7ae6f8..18e6e35da 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -94,8 +94,18 @@ impl<'cfg> PathSource<'cfg> { human(format!("could not parse pattern `{}`: {}", p, e)) }) }; - let exclude = pkg.manifest().exclude().iter().map(|p| parse(p)).collect::, _>>()?; - let include = pkg.manifest().include().iter().map(|p| parse(p)).collect::, _>>()?; + + let exclude = pkg.manifest() + .exclude() + .iter() + .map(|p| parse(p)) + .collect::, _>>()?; + + let include = pkg.manifest() + .include() + .iter() + .map(|p| parse(p)) + .collect::, _>>()?; let mut filter = |p: &Path| { let relative_path = util::without_prefix(p, &root).unwrap(); diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs index ca61e3a54..c5d70b709 100644 --- a/src/cargo/util/toml.rs +++ b/src/cargo/util/toml.rs @@ -597,15 +597,21 @@ impl TomlManifest { } // Collect the deps - process_dependencies(&mut cx, self.dependencies.as_ref(), None)?; - process_dependencies(&mut cx, self.dev_dependencies.as_ref(), Some(Kind::Development))?; - process_dependencies(&mut cx, self.build_dependencies.as_ref(), Some(Kind::Build))?; + process_dependencies(&mut cx, self.dependencies.as_ref(), + None)?; + process_dependencies(&mut cx, self.dev_dependencies.as_ref(), + Some(Kind::Development))?; + process_dependencies(&mut cx, self.build_dependencies.as_ref(), + Some(Kind::Build))?; for (name, platform) in self.target.iter().flat_map(|t| t) { cx.platform = Some(name.parse()?); - process_dependencies(&mut cx, platform.dependencies.as_ref(), None)?; - process_dependencies(&mut cx, platform.build_dependencies.as_ref(), Some(Kind::Build))?; - process_dependencies(&mut cx, platform.dev_dependencies.as_ref(), Some(Kind::Development))?; + process_dependencies(&mut cx, platform.dependencies.as_ref(), + None)?; + process_dependencies(&mut cx, platform.build_dependencies.as_ref(), + Some(Kind::Build))?; + process_dependencies(&mut cx, platform.dev_dependencies.as_ref(), + Some(Kind::Development))?; } replace = self.replace(&mut cx)?; -- 2.30.2